There seems to be a conflict with the current master branch. Rather than merging this to the current master, perhaps we can merge your micro branch to a micro branch here.

i was confused :)
i am trying to figure out a way to pull in your updates... is that a
fetch? sorry i come from svn world.
i couldnt find a way to fetch with github..
thanks,
Clay
On 10/4/12 10:11 AM, David Pennington wrote:

There seems to be a conflict with the current master branch. Rather than merging to master, perhaps we can merge to your micro branch.

---

Reply to this email directly or view it on GitHub:
#33 (comment)

A git pull is the same as a git fetch and git merge. I recommend http://gitcasts.com/ and http://git-scm.com/book if you want to learn more about git.

Basically, if you are on the "micro" branch, I think you need to git pull xeoncross master into your branch to get my updates.